Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Sat, 11 Mar 2006 10:20:32 +0000 (11:20 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Sat, 11 Mar 2006 10:20:32 +0000 (11:20 +0100)

Trivial merge